Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.16: Bump and unpin tokio (backport of #32430) #32909

Conversation

andreisilviudragnea
Copy link

@andreisilviudragnea andreisilviudragnea commented Aug 20, 2023

Problem

Tokio version specifier "~1.14.1" only allows patch updates and v1.14.1 is more than a year old.

Summary of Changes

Backport of #32430

Fixes #32878

@mergify mergify bot added community Community contribution need:merge-assist labels Aug 20, 2023
@mergify mergify bot requested a review from a team August 20, 2023 11:55
This was referenced Aug 20, 2023
* Bump tokio to current, and unpin

* Remove patch since ntapi is not longer in tree

(cherry picked from commit c020211)
@andreisilviudragnea
Copy link
Author

Hello. Could you take a look at this PR?

It is a blocker for us at the moment, as we need to downgrade our dependencies in order to upgrade from Solana v.1.14 to v1.16 on devnet.

A new Solana v1.16 release is needed after this PR is merged.

@CriesofCarrots @behzadnouri @mvines

@@ -380,7 +380,7 @@ tempfile = "3.5.0"
test-case = "2.2.2"
thiserror = "1.0.40"
tiny-bip39 = "0.8.2"
tokio = "~1.14.1"
tokio = "1.29.1"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's too risky for us to upgrade the tokio dependency like this. We'd want the lockfile to keep tokio at 1.14.1 for the purposes of the entire v1.16 code base. But how about changing to tokio = "1" in the client/ crate? This should still enable the build to select 1.14.1 from the workspace lockfile, and when the next solana-client crate is published, the crates.io-dependency would revert back to tokio = "1" and be consistent with the tokio dependency in the v1.14 version of the client crate

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mvines So, are ready to merge the PR #32879 and backport it to the v1.16?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

maybe #32879 in v1.16 only. I don't think it's necessary in master

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for master we can just upgrade tokio directly to the newest crate if that works

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mvines I've created the PR #32943.
It solves issue #32878 as suggested.

@mvines
Copy link
Member

mvines commented Aug 23, 2023

Closing this in favour of #32943

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
community Community contribution need:merge-assist
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants